replace gui dir with views & static (pymedusa#1206)

.build/Gruntfile.js

@@ -5,7 +5,7 @@ module.exports = function(grunt) {
         clean: {
             dist: './dist/',
             bower_components: './bower_components',
-            fonts: '../gui/slick/css/*.ttf',
+            fonts: '../static/css/*.ttf',
             options: {
                 force: true
             }
@@ -63,7 +63,7 @@ module.exports = function(grunt) {
                     src: [
                         '*.ttf'
                     ],
-                    dest: '../gui/slick/css/'
+                    dest: '../static/css/'
                 }]
             },
             glyphicon: {
@@ -78,24 +78,14 @@ module.exports = function(grunt) {
                         '*.woff',
                         '*.woff2'
                     ],
-                    dest: '../gui/slick/fonts/'
+                    dest: '../static/fonts/'
                 }]
             }
         },
         uglify: {
             bower: {
                 files: {
-                    '../gui/slick/js/vender.min.js': ['./dist/bower.js']
-                }
-            }
-        },
-        sass: {
-            options: {
-                sourceMap: true
-            },
-            core: {
-                files: {
-                    './dist/core.css': ['../gui/slick/scss/core.scss']
+                    '../static/js/vender.min.js': ['./dist/bower.js']
                 }
             }
         },
@@ -106,12 +96,12 @@ module.exports = function(grunt) {
             },
             bower: {
                 files: {
-                    '../gui/slick/css/vender.min.css': ['./dist/bower.css']
+                    '../static/css/vender.min.css': ['./dist/bower.css']
                 }
             },
             core: {
                 files: {
-                    '../gui/slick/css/core.min.css': ['./dist/core.css']
+                    '../static/css/core.min.css': ['./dist/core.css']
                 }
             }
         },
@@ -120,10 +110,10 @@ module.exports = function(grunt) {
                 jshintrc: '../.jshintrc'
             },
             all: [
-                '../gui/slick/js/**/*.js',
-                '!../gui/slick/js/lib/**/*.js',
-                '!../gui/slick/js/ajax-notifications.js',
-                '!../gui/slick/js/**/*.min.js', // We use this because ignores doesn't seem to work :(
+                '../static/js/**/*.js',
+                '!../static/js/lib/**/*.js',
+                '!../static/js/ajax-notifications.js',
+                '!../static/js/**/*.min.js', // We use this because ignores doesn't seem to work :(
             ]
         },
         mocha: {
@@ -151,7 +141,6 @@ module.exports = function(grunt) {
         'bower_concat',
         'copy',
         'uglify',
-        'sass',
         'cssmin',
         'mocha'
     ]);

.build/test/testrunner.html

@@ -13,8 +13,8 @@
         <div id="mocha"></div>
         <script src="../node_modules/mocha/mocha.js"></script>
         <script src="../node_modules/chai/chai.js"></script>
-        <script src="../../gui/slick/js/vender.min.js"></script>
-        <script src="../../gui/slick/js/core.js"></script>
+        <script src="../../static/js/vender.min.js"></script>
+        <script src="../../static/js/core.js"></script>
 
         <script>
             mocha.setup('bdd');

medusa/media/GenericMedia.py

@@ -76,7 +76,7 @@ def get_media_root():
         :return: The root folder containing the media
         """
 
-        return ek(join, app.PROG_DIR, 'gui', 'slick')
+        return ek(join, app.PROG_DIR, 'static')
 
     def get_media_type(self):
         """

medusa/server/web/core/base.py

@@ -47,7 +47,7 @@ def get_lookup():
     global mako_path  # pylint: disable=global-statement
 
     if mako_path is None:
-        mako_path = ek(os.path.join, app.PROG_DIR, 'gui/{gui_name}/views/'.format(gui_name=app.GUI_NAME))
+        mako_path = ek(os.path.join, app.PROG_DIR, 'views/')
     if mako_cache is None:
         mako_cache = ek(os.path.join, app.CACHE_DIR, 'mako')
     if mako_lookup is None:

package.json

@@ -11,7 +11,7 @@
   },
   "homepage": "https://github.com/PyMedusa/SickRage#readme",
   "scripts": {
-    "test": "xo gui/slick/js/*.js",
+    "test": "xo static/js/*.js",
     "security": "snyk test"
   },
   "devDependencies": {

readme.md

@@ -54,7 +54,7 @@ A full list can be found here: [Link](https://github.com/PyMedusa/SickRage/wiki/
 ![image](https://thepiratebay.se/favicon.ico)[ThePirateBay](https://thepiratebay.se/)
 ![image](https://nzb.cat/favicon.ico)[NZB.cat](https://nzb.cat/)
 ![image](https://nzbgeek.info/favicon.ico)[NZBGeek](https://nzbgeek.info)
-![image](https://raw.githubusercontent.com/PyMedusa/SickRage/master/gui/slick/images/providers/dognzb.png)[DOGnzb](dognzb.cr)
+![image](https://raw.githubusercontent.com/PyMedusa/SickRage/master/static/images/providers/dognzb.png)[DOGnzb](dognzb.cr)
 
 #### Browsers support <sub><sub>made by <a href="https://godban.github.io">godban</a></sub></sub>
 

start.py

@@ -346,7 +346,7 @@ def start(self, args):  # pylint: disable=too-many-branches,too-many-statements
         self.web_options = {
             'port': int(self.start_port),
             'host': self.web_host,
-            'data_root': ek(os.path.join, app.PROG_DIR, 'gui', app.GUI_NAME),
+            'data_root': ek(os.path.join, app.PROG_DIR, 'static'),
             'web_root': app.WEB_ROOT,
             'log_dir': self.log_dir,
             'username': app.WEB_USERNAME,