Merge pull request #16 from NoiSek/rewrite

Full Rewrite & Customization Dialogue
NoiSek · Mar 17, 2017 · b3dd386 · b3dd386
2 parents 2610964 + 22cf557
commit b3dd386
Show file tree

Hide file tree

Showing 83 changed files with 6,492 additions and 1,669 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,8 @@
-{   
+{
     "presets": ["es2015"],
-    "plugins": ["babel-plugin-syntax-jsx", "babel-plugin-inferno"]
+    "plugins": [
+      "babel-plugin-syntax-jsx",
+      "babel-plugin-inferno",
+      "transform-object-rest-spread"
+    ]
 }
diff --git a/.eslintrc b/.eslintrc
@@ -3,32 +3,56 @@
     "browser": true,
     "es6": true
   },
-  "extends": "eslint:recommended",
+  "globals": {},
+  "extends": [
+    "eslint:recommended",
+    "plugin:inferno/recommended"
+  ],
   "parserOptions": {
     "ecmaFeatures": {
-    " experimentalObjectRestSpread": true,
+      "experimentalObjectRestSpread": true,
       "jsx": true
     },
     "sourceType": "module"
   },
   "plugins": [
-    "react"
+    "inferno"
   ],
   "rules": {
     "indent": [
       "error",
-      2
+      2,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "inferno/prop-types": [
+      "off"
     ],
     "linebreak-style": [
       "error",
       "unix"
     ],
     "no-unused-vars" : [
-      "warn"
+      "warn",
+      {
+        "varsIgnorePattern": "Inferno*",
+        "argsIgnorePattern": "_*"
+      }
+    ],
+    "no-warning-comments" : [
+      "warn",
+      {
+        "terms": [
+          "todo",
+          "fixme",
+          "hack"
+        ]
+      }
     ],
     "semi": [
       "error",
       "always"
     ]
   }
-}
+}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 **/node_modules/**
 **/.sass-cache/**
+
+npm-debug.log
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ A Sleek, straightforward Archlinux themed login screen written on lightdm and th
   - [Troubleshooting](#troubleshooting)
     - [My login screen hasn't changed!](#my-login-screen-hasnt-changed)
     - [My screen is black!](#my-screen-is-black)
+    - [My system hangs at the boot screen!](#my-system-hangs-at-the-boot-screen)
     - [The lock screen isn't using my lightdm theme!](#the-lock-screen-isnt-using-my-lightdm-theme)
   - [Development](#development)
     - [Running Tests](#running-tests)
@@ -119,7 +120,6 @@ If you see something similar to:
 
 Then you should try re-installing and / or reconfiguring your graphics drivers, especially if this occurred after a kernel update.
 
-
 ### The lock screen isn't using my lightdm theme!
 
 If you are using cinnamon, gnome, or any gnome derivative; Good Luck. The solution involves [light-locker (community/light-locker)](https://github.com/the-cavalry/light-locker), but conflicts with the existing lock / screensaver applications. There is no known way to resolve this.
@@ -156,13 +156,6 @@ npm run build
 npm run watch
 ```
 
-##### Todo
-- [x] Separate dates from their parent components
-- [x] Implement wallpaper customization
-- [ ] Add switchable CSS themes
-- [ ] Rewrite using Redux for testing reasons.
-
-
 ##### Credit
 - *Bear by Yu luck from the Noun Project*
 - *Power by Nikita Kozin from the Noun Project*
diff --git a/index.html b/index.html
@@ -3,25 +3,26 @@
   <head>
     <meta charset="utf-8">
     <title>Amazing Content</title>
-    <link rel="stylesheet" href="src/css/main.css">
+    <link rel="stylesheet" href="src/css/style.css">
   </head>
   <body>
     <div class="wallpaper-background">
-      <div class="wallpaper-foreground">
-      </div>
+      <div class="wallpaper-foreground"></div>
+      <div class="wallpaper-preload"></div>
     </div>
+
     <div class="notifications-container">
     </div>
+
     <div class="login-window-container">
-      <div class="login-window">
-        <div id="command-panel" class="left-col">
-        </div>
-        <div id="login-panel" class="right-col">
-        </div>
-      </div>
-      <div id="date-display">
-      </div>
+      <div id="login-window-mount"></div>
+      <div id="date-display" class="date-display"></div>
     </div>
+
+    <div id="settings" class="settings hidden"></div>
+
+    <div id="settings-toggler-mount"></div>
+
     <script type="text/javascript">
       window.debug = false;
 

diff --git a/package.json b/package.json
@@ -5,8 +5,12 @@
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/.bin/eslint src/es6/**",
-    "build": "npm run test && ./node_modules/.bin/webpack --progress --colors --optimize-dedupe --optimize-minimize --optimize-occurrence-order && ./node_modules/.bin/node-sass src/sass --output src/css",
-    "watch": "./node_modules/.bin/webpack --progress --colors --watch & ./node_modules/.bin/node-sass --watch src/sass --output src/css"
+    "build-js": "./node_modules/.bin/webpack --progress --colors --optimize-minimize --env.production",
+    "build-sass": "./node_modules/.bin/node-sass src/sass --output src/css",
+    "build": "npm run test && npm run build-js && npm run build-sass",
+    "watch-js": "./node_modules/.bin/webpack --progress --colors --watch --env.development",
+    "watch-sass": "./node_modules/.bin/node-sass --watch src/sass --output src/css -E utf-8",
+    "watch": "npm run watch-sass & npm run watch-js"
   },
   "repository": {
     "type": "git",
@@ -22,18 +26,26 @@
     "arch"
   ],
   "author": "Noi Sek",
-  "license": "GPLv2",
+  "license": "GPL-3.0",
   "bugs": {
     "url": "https://github.com/noisek/Aether/issues"
   },
   "homepage": "https://github.com/noisek/Aether#readme",
-  "devDependencies": {
-    "babel-loader": "^6.2.5",
-    "babel-plugin-inferno": "^0.7.7",
-    "babel-preset-es2015": "^6.14.0",
-    "eslint": "^3.0.1",
-    "eslint-plugin-react": "^5.2.2",
-    "node-sass": "^3.8.0",
-    "webpack": "^1.13.2"
+  "dependencies": {
+    "babel-core": "~6.23.1",
+    "babel-loader": "~6.3.2",
+    "babel-plugin-inferno": "~1.9.0",
+    "babel-plugin-transform-object-rest-spread": "~6.23.0",
+    "babel-preset-es2015": "~6.22.0",
+    "cxs": "^3.0.4",
+    "eslint": "~3.15.0",
+    "eslint-plugin-inferno": "~6.9.2",
+    "inferno": "^1.3.0-rc.3",
+    "inferno-component": "^1.3.0-rc.3",
+    "inferno-dom": "^1.0.7",
+    "node-sass": "~4.5.0",
+    "redux": "~3.6.0",
+    "strftime": "^0.10.0",
+    "webpack": "~2.2.1"
   }
 }
diff --git a/src/css/animations.css b/src/css/animations.css
diff --git a/src/css/animations.css.map b/src/css/animations.css.map
diff --git a/src/css/config.css b/src/css/config.css
diff --git a/src/css/config.css.map b/src/css/config.css.map
diff --git a/src/css/fonts.css b/src/css/fonts.css
diff --git a/src/css/fonts.css.map b/src/css/fonts.css.map