Merge pull request 'Caraousel om the home page' (#4 ) from ta0004_home_carousel into master

Reviewed-on: http://gitea:3000/admin-tea/git-basics/pulls/4
Merge branch 'master' of gitea:admin-tea/git-basics into ta0004_home_carousel
2021-05-28 19:52:44 +02:00 · 2021-05-28 19:45:06 +02:00 · 2021-05-28 19:35:51 +02:00 · 2021-05-28 19:26:28 +02:00 · 2021-05-28 19:20:35 +02:00 · 2021-05-28 19:04:37 +02:00
6 changed files with 36 additions and 0 deletions
--- a/cart/virtual_card.py
+++ b/cart/virtual_card.py
--- a/hello.py
+++ b/hello.py
@@ -1,7 +1,9 @@
 #!/usr/bin/python3
 import os
+import timedate

 print("Hello-World for Python!")
 # OS Info!
+# More info
 print(os.getlogin)
 print(os.getpid)
--- a/stock/stock_manager_service.py
+++ b/stock/stock_manager_service.py
--- a/styles/carousel.css
+++ b/styles/carousel.css
--- a/styles/login.css
+++ b/styles/login.css
--- a/webs/home.html
+++ b/webs/home.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+   index.html
+   Copyright 2021 mpho <<mphoraff> @ gmail<dot>com>
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA.
+-->
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible">
+  <title>Hexagon Pics</title>
+  <meta name="generator" content="Geany 1.36" />
+  <link rel="stylesheet" href="../styles/carousel.css"> 
+  <link rel="stylesheet" href="../styles/login.css"> 
+</head>
+
+<body>
+	Hello World!
+</body>
+
+</html>
Author	SHA1	Message	Date
Mpho raf	73f50999e7	Merge pull request 'Caraousel om the home page' (#4 ) from ta0004_home_carousel into master Reviewed-on: http://gitea:3000/admin-tea/git-basics/pulls/4	2021-05-28 19:52:44 +02:00
Mpho raf	633fbb0e8b	Merge branch 'master' of gitea:admin-tea/git-basics into ta0004_home_carousel	2021-05-28 19:45:06 +02:00
Mpho raf	72ace19fc2	Caraousel om the home page	2021-05-28 19:35:51 +02:00
Mpho raf	e0a5e7f36a	Added popup web login	2021-05-28 19:26:28 +02:00
Mpho raf	75d8e45c18	Added home web-page	2021-05-28 19:20:35 +02:00
Mpho raf	4f1db18c1b	added virtual card concerpts	2021-05-28 19:04:37 +02:00
Mpho raf	da058dc24e	Stock manager is implemented	2021-05-28 19:00:51 +02:00
Mpho raf	9a5c5969e7	Merge branch 'featurex'	2021-05-27 21:15:47 +02:00
Mpho raf	59142a7d87	commit hello file	2021-05-27 21:15:16 +02:00
Mpho raf	9b6b9e0ac6	Modified hello.py	2021-05-27 21:13:07 +02:00