Commit 6d264672 authored by Guanwei Liu's avatar Guanwei Liu
Browse files

updated interface

parent 87d97ea1

app/Http/Controllers/SearchController.php

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ class SearchController extends Controller 
        // dd($types);

        $chars=HNG::where('entry','=',$kanji)->orWhere('variants','like','%'.$kanji.'%')->first();

        $results=array();

        if(is_Null($chars)){

            return null;

        }

        $results['chars']=$chars;

        // $results=HNG::where('entry','=',$kanji)->orWhere('variants','like','%'.$kanji.'%')->get()->toArray();
@@ -43,8 +46,6 @@ class SearchController extends Controller 
                        // $cardnum=(int)substr($num,0,-1);

                        $cardnum=(int)$num;



                        



                        switch(substr($num,-1)){

                            case "a":

                                $charID=(int)substr($num,0,-1) * 10+1;

public/js/app.js

+29648 −1

File changed.

Preview size limit exceeded, changes collapsed.

resources/assets/js/App.vue

+50 −68
Original line number Diff line number Diff line 
<template>

  <v-app>

    

    <v-navigation-drawer fixed app v-model="drawer">

      <v-list dense>

        <v-list-tile @click="$router.push('/')">

          <v-list-tile-action>

            <v-icon>home</v-icon>

          </v-list-tile-action>

          <v-list-tile-content>

            <v-list-tile-title>検索</v-list-tile-title>

          </v-list-tile-content>

        </v-list-tile>



        <v-list-tile @click="$router.push('/about')">

          <v-list-tile-action>

            <v-icon>contact_mail</v-icon>

          </v-list-tile-action>

          <v-list-tile-content>

            <v-list-tile-title>アバウト</v-list-tile-title>

          </v-list-tile-content>

        </v-list-tile>

      </v-list>

    </v-navigation-drawer>



    <v-toolbar app color="amber darken-4" dark>

      <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>

      <v-toolbar-title>HNG 単字検索</v-toolbar-title>

  <v-app style="background: #EDEBE0;">

    <v-toolbar app color="primary" dark>

      <v-toolbar-title><span @click.stop="goHome()">HNG&nbsp;単字検索</span></v-toolbar-title>

      <v-spacer></v-spacer>

      <v-flex xs1 class="hidden-sm-and-down">

        <v-text-field solo light autofocus flat single-line background-color="white" v-model="termTop"

          @keyup.enter="search"></v-text-field>

      </v-flex>

      <v-btn color="secondary" @click="search" class="hidden-sm-and-down">検索</v-btn>



      <v-dialog v-model="dialog" width="500">

        <v-btn icon slot="activator">

          <v-icon>search</v-icon>

      <v-btn color="secondary" flat @click="goHome">

        <v-icon>announcement</v-icon>

        使い方

      </v-btn>



        <v-card>

          <v-card-title class="headline grey lighten-2" primary-title>単字検索</v-card-title>



          <v-card-text>

            <v-text-field v-model="termTop" @keyup.enter="search()"></v-text-field>

          </v-card-text>

          <v-divider></v-divider>



          <v-card-actions>

            <v-spacer></v-spacer>

            <v-btn color="primary" flat @click="search()">検索</v-btn>

          </v-card-actions>

        </v-card>

      </v-dialog>

    </v-toolbar>



    <v-content>
@@ -59,6 +25,12 @@ 
  </v-app>

</template>



<style scoped>

  .toolbar {

    width: 2%

  }

</style>



<script>

  import FooterSection from "./components/Footer";

  export default {
@@ -70,16 +42,26 @@ export default { 
        this.termTop = this.$route.params.hanzi

      }

    },

    watch: {

      $route(to, from) {

        this.termTop = this.$route.params.hanzi;

      }

    },





    data: () => ({

    drawer: false,

    dialog:false,

      termTop: ""

    }),

    methods: {

      search: function () {

      this.dialog=false;

        if (this.term != "") {

          this.$router.push('/search/' + this.termTop);

        }

      },

      goHome: function () {

        this.termTop = ""

        this.$router.push('/');

      }

    }

  };

</script>
 
 No newline at end of file

resources/assets/js/app.js

+8 −1
Original line number Diff line number Diff line
@@ -14,7 +14,14 @@ import 'vuetify/dist/vuetify.min.css' 
import 'material-design-icons-iconfont/dist/material-design-icons.css'



import router from './router'

Vue.use(Vuetify)

Vue.use(Vuetify,{

    theme:{

        primary:'#AF3648',

        secondary:'#C98184',

        success:'#00C9C9',

        accent:'#FFE4E5'

    }

})



/**

 * Next, we will create a fresh Vue application instance and attach it to

resources/assets/js/components/Footer.vue

+11 −9
Original line number Diff line number Diff line 
<template>

    <v-footer app color="amber darken-4" dark>

      <v-card class="flex" flat tile dark>

        <v-card-actions class="red justify-center">

          <v-icon>copyright</v-icon>

          <a href="http://www.hng-data.org"><strong>漢字字体規範史データセット保存会</strong></a>

  <v-footer app dark>

    <v-card class="flex" flat tile dark color="secondary">

      <v-card-actions class="justify-center body-1">

        &copy;2019&nbsp;

        <strong>

          <a href="http://www.hng-data.org" dark>漢字字体規範史データセット保存会</a>

        </strong>

      </v-card-actions>

    </v-card>

  </v-footer>