diff --git a/app/controllers/main.controller.js b/app/controllers/main.controller.js index c52ba97..1141bc5 100644 --- a/app/controllers/main.controller.js +++ b/app/controllers/main.controller.js @@ -1,79 +1,83 @@ module.exports = function($scope, pageViews, searchService) { $scope.search = { str: "", list: [] }; + + $scope.chart = { + selected: "Line" + }; $scope.groups = [ { 'name' : 'Dogs', 'breeds': [ 'Labrador', 'Retriever', 'Boxer', 'Cocker Spaniel' ]}, { 'name': 'Cats', 'breeds': [ 'Russian blue', 'Ragdoll', 'Norwegian Forest Cat' ]}, { 'name': 'Fish', 'breeds': [ 'Salmon', 'Pike', 'Trout', 'Bass' ]} ]; $scope.projects = [ // TODO: Proper externalization and language checking {name: "Wikipedia", url: "$lang$.wikipedia", multilang: true}, {name: "Wikiversity", url: "$lang$.wikiversity", multilang: true}, {name: "Wikisource", url: "$lang$.wikisource", multilang: true}, {name: "Wikinews", url: "$lang$.wikinews", multilang: true}, {name: "Wikibooks", url: "$lang$.wikibooks", multilang: true}, {name: "Wikiquote", url: "$lang$.wikiquote", multilang: true}, {name: "Wikispecies", url: "species.wikimedia", multilang: false}, {name: "Wikivoyage", url: "$lang$.wikivoyage", multilang: true}, {name: "Wikidata", url: "www.wikidata", multilang: false}, {name: "Wikicommons", url: "commons.wikimedia", multilang: false}, {name: "Metawiki", url: "meta.wikimedia", multilang: false} ]; $scope.chosen = { proj: $scope.projects[0].name, lang: "Svenska" }; $scope.changeChosen = function(name, dropdown){ $scope.chosen[dropdown] = name; }; $scope.$watch('search.str.length', function () { var searchstr = $scope.search.str; if(searchstr.length <= 0) { $scope.search.list = []; return; } searchService.query({ namespace: 'sv.wikipedia', //TODO str: searchstr }).then(function(data) { if($scope.search.str == searchstr) $scope.search.list = data.data; }); }); pageViews.query({ project: "en.wikipedia", article: "Dog", from: "20160101", to: "20160110", }).$promise.then(function(result) { console.log(result.article); }); }; diff --git a/app/index.html b/app/index.html index 8f4e415..488096f 100644 --- a/app/index.html +++ b/app/index.html @@ -1,84 +1,124 @@ - - - Wikistats - - - - - - - - - - - -
-
-
-
-
- - -
-
- - -
-
-
- -
-
-
-
    -
  • {{ s }}
    • -
-
-
-
-
- - - - {{animal.name}} - -
  • - {{breed}} -
    • -     -     -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - + + + Wikistats + + + + + + + + + + + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + +
    +
    +
    +
      +
    • {{ s }}
      • +
    +
    +
    +
    +
    + + + + {{animal.name}} + +
  • + {{breed}} +
    • +     +     +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 50cd5b9..95a5df3 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -1,47 +1,46 @@ li { - left: 30px; - position: relative +// position: relative } .dddiv { display: inline-block; width: 50%; ul { padding-top: 5px; padding-left: 0px; padding-right: 10px; padding-bottom: 0px; width: 100%; min-width: 10px; li { left: auto; } } } .ddbtn { width: 100%; border-radius: 0px; background-color: #9A9A9A; border-color: #737373; } .open { button{ background-color: #747474 !important; border-color: #545454 !important; } } html, body { height: 100%; } .fill { min-height: 100%; height: 100%; /* cross-browser */ } .fill-col { height: 100%; min-height: 100%; display: block; }