Skip to content
This repository has been archived by the owner on Jun 29, 2021. It is now read-only.

Commit

Permalink
Merge branch 'tux-233-setting-redirect-bug' into 'develop'
Browse files Browse the repository at this point in the history 
Tux 233 setting redirect bug

See merge request titania/titania-os!15
  • Loading branch information
@dalekatwork
dalekatwork committed Nov 14, 2018
2 parents 2020941 + 579b887 commit 422f145
Show file tree
Hide file tree
Showing 16 changed files with 100 additions and 119 deletions.
2 changes: 1 addition & 1 deletion meta-titania/conf/distro/titania.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DISTRO = "titania"
DISTRO_NAME = "TitaniaOS"
DISTRO_VERSION_MAJOR ?= "1"
DISTRO_VERSION_MINOR ?= "1"
DISTRO_VERSION_PATCH ?= "0"
DISTRO_VERSION_PATCH ?= "1"
# Override if you need an RC or something like that
# NOTE: add the hyphen on your own, e.g. "-rc5"
DISTRO_VERSION_EXT ?= ""
Expand Down
13 changes: 7 additions & 6 deletions meta-titania/recipes-core/images/titania-packages.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ IMAGE_INSTALL += "linux-firmware-bcm43430"
IMAGE_INSTALL += "linux-firmware-bcm43455"
# linux-firmware-bcm43430a1-hcd linux-firmware-bcm4345c0-hcd"

# Merge UX version with main OS-release file
append_ux_id () {
cat ${IMAGE_ROOTFS}${sysconfdir}/titania-ux-version >> ${IMAGE_ROOTFS}${sysconfdir}/os-release
rm ${IMAGE_ROOTFS}${sysconfdir}/titania-ux-version
}
ROOTFS_POSTPROCESS_COMMAND += "append_ux_id ; "
# From v1.1.0, the titania-ux repo has been merged into titania-os repo
# # Merge UX version with main OS-release file
# append_ux_id () {
# cat ${IMAGE_ROOTFS}${sysconfdir}/titania-ux-version >> ${IMAGE_ROOTFS}${sysconfdir}/os-release
# rm ${IMAGE_ROOTFS}${sysconfdir}/titania-ux-version
# }
# ROOTFS_POSTPROCESS_COMMAND += "append_ux_id ; "
27 changes: 2 additions & 25 deletions meta-titania/recipes-titania/ux-titania/ux-titania.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,8 @@ LICENSE = "GPL-3.0"
LIC_FILES_CHKSUM = "file://../LICENCE.md;md5=8c40fdc41c95755623d451deddccda48"

SRC_URI = "\
file://vuedj/monit_dashboard.py \
file://vuedj/manage.py \
file://vuedj/vuedj/__init__.py \
file://vuedj/vuedj/wsgi.py \
file://vuedj/vuedj/urls.py \
file://vuedj/vuedj/settings.py \
file://vuedj/common.py \
file://vuedj/configtitania/tests.py \
file://vuedj/configtitania/__init__.py \
file://vuedj/configtitania/admin.py \
file://vuedj/configtitania/models.py \
file://vuedj/configtitania/apps.py \
file://vuedj/configtitania/views.py \
file://vuedj/configtitania/serializers.py \
file://dist/static/img/titania-Logo-port.8ed00d5.svg \
file://dist/static/img/landing-winter.ee35bd8.svg \
file://dist/static/titania.png \
file://dist/static/css/app.ee7cf4f4dabeb5990e6e2495431c3cd7.css \
file://dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map \
file://dist/static/js/app.9ffdd57f4d945d131a0a.js.map \
file://dist/static/js/vendor.00347b8c0f276345b776.js \
file://dist/static/js/app.9ffdd57f4d945d131a0a.js \
file://dist/static/js/vendor.00347b8c0f276345b776.js.map \
file://dist/static/js/manifest.2ae2e69a05c33dfc65f8.js \
file://dist/index.html \
file://vuedj/* \
file://dist/* \
file://LICENCE.md \
file://ux-titania.service \
file://monit-dashboard.service \
Expand Down
2 changes: 1 addition & 1 deletion ux/dist/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" type=image/png href=/static/titania.png><title>Titania</title><link href=/static/css/app.ee7cf4f4dabeb5990e6e2495431c3cd7.css rel=stylesheet></head><body><script src=https://unpkg.com/vue-highcharts/dist/vue-highcharts.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.00347b8c0f276345b776.js></script><script type=text/javascript src=/static/js/app.9ffdd57f4d945d131a0a.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" type=image/png href=/static/titania.png><title>Titania</title><link href=/static/css/app.88d768853b40ec8b2183ffde5fd756d0.css rel=stylesheet></head><body><script src=https://unpkg.com/vue-highcharts/dist/vue-highcharts.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.2ae2e69a05c33dfc65f8.js></script><script type=text/javascript src=/static/js/vendor.00347b8c0f276345b776.js></script><script type=text/javascript src=/static/js/app.09229d4d02c1b906eba4.js></script></body></html>
2 changes: 1 addition & 1 deletion .../app.ee7cf4f4dabeb5990e6e2495431c3cd7.css → .../app.88d768853b40ec8b2183ffde5fd756d0.css
View file

Large diffs are not rendered by default.

97 changes: 49 additions & 48 deletions ...ist/static/js/app.9ffdd57f4d945d131a0a.js → ...ist/static/js/app.09229d4d02c1b906eba4.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ux/dist/static/js/app.09229d4d02c1b906eba4.js.map
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ux/dist/static/js/app.9ffdd57f4d945d131a0a.js.map
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ux/dist/static/js/manifest.2ae2e69a05c33dfc65f8.js.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ux/src/assets/css/sass/titania.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ input:not(.box-name-field):not(.config-input-field):not(.popup-input):not(.popup
bottom: 16px;
z-index: 98;
box-shadow: 0 0 30px 2px #B5B5B5;
height: 376px;
height: 316px;
width: 430px;
overflow-y: auto;
margin: auto;
Expand All @@ -384,7 +384,7 @@ input:not(.box-name-field):not(.config-input-field):not(.popup-input):not(.popup

.popup-content-hash{
width: 338px;
height: 286px;
height: 224px;
background-color: $brand-highlight;
margin: 45px auto 20px;
}
Expand Down
4 changes: 2 additions & 2 deletions ux/src/assets/css/titania.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ input:not(.box-name-field):not(.config-input-field):not(.popup-input):not(.popup
bottom: 16px;
z-index: 98;
box-shadow: 0 0 30px 2px #B5B5B5;
height: 376px;
height: 316px;
width: 430px;
overflow-y: auto;
margin: auto;
Expand All @@ -373,7 +373,7 @@ input:not(.box-name-field):not(.config-input-field):not(.popup-input):not(.popup

.popup-content-hash {
width: 338px;
height: 286px;
height: 224px;
background-color: #F0F0F0;
margin: 45px auto 20px;
}
Expand Down
2 changes: 1 addition & 1 deletion ux/src/components/common/footerParent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class='copyright'>&copy;&nbsp; {{new Date().getFullYear()}} Libertaria</span>
<span id='registeredto' class='registeredto hide' v-bind:class="{show : !getFooterClass()}">Logged in as: <span>{{username}}</span></span>
<span id='registeredto' class='registeredto hide warn-text' v-bind:class="{show : !getFooterClass()}">
<a v-if="this.$store.state.natpmp === '0'" href="https://portforward.com/router.htm" target="_blank">NATPMP: OFF</a></span>
<a v-if="this.$store.state.natpmp === '0'" href="https://www.noip.com/support/knowledgebase/general-port-forwarding-guide/" target="_blank">NATPMP: OFF</a></span>
</div>
<div class='float-right footer-links padding-right-20'>
<span class="padding-right-20 white-paper-footer"><a href="https://drive.google.com/file/d/11xDyBFACJYxrDQY4YNdiBqF8UFhgvpT9/view" target="_blank">White Paper</a></span>
Expand Down
16 changes: 7 additions & 9 deletions ux/src/components/common/hashPopup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
<div class="header-fontsize sans-serif-bold padding-top-bottom-16">HASH INFORMATION</div>
<div class="padding-top-bottom-16">
<div class="col-12">
<div class="padding-left-16 sans-serif-normal text-align large-fontsize">Yocto Hash</div>
<div @click="copyToClipboard('yocto')" class="hash-id-div" type="text">{{this.$store.state.build_id}}</div>
<div class="padding-left-16 sans-serif-normal link-text text-align large-fontsize"><a href="https://github.com/libertaria-project/titania-os" target="_blank">OS Repo</a></div>
<div @click="copyToClipboard()" class="hash-id-div" type="text">{{this.$store.state.build_id}}</div>
</div>
<div class="col-12">
<!-- <div class="col-12">
<div class="padding-left-16 sans-serif-normal text-align large-fontsize">UX Hash</div>
<div @click="copyToClipboard('ux')" class="hash-id-div" type="text">{{this.$store.state.ux_id}}</div>
</div>
</div> -->
</div>
</div>
<div class="display-inline-flex popup-browser-primary-copy cursor-pointer outline-none regular-fontsize">
<img src="../../assets/images/ic-copy.svg">
<div @click="copyToClipboard('all')" class="padding-top-bottom-12">Copy Hash</div>
<div @click="copyToClipboard()" class="padding-top-bottom-12">Copy Hash</div>
</div>
</div>
</div>
Expand All @@ -37,10 +37,8 @@ export default {
}
},
methods: {
copyToClipboard: function (txtformat) {
var copytext = txtformat === "yocto"|| txtformat === "all"? "Yocto Hash: "+this.$store.state.build_id:""
copytext += txtformat === "all"? ", ":""
copytext += txtformat === "ux"||txtformat === "all"? "UX Hash: "+ this.$store.state.ux_id:""
copyToClipboard: function () {
var copytext = "Hash: "+this.$store.state.build_id
var aux = document.createElement("input")
aux.setAttribute("value", copytext)
document.body.appendChild(aux)
Expand Down
9 changes: 6 additions & 3 deletions ux/src/components/configuration/configForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="sans-serif-normal text-align large-fontsize">WIFI Network</div>
<div class="text-align cursor-pointer selected-wifi" @click="getWiFiList()">{{currentwifiap}} <div v-if="this.editProp === false" class='float-right'>&#9662;</div></div>
<ul class='dropdown-config hide' >
<li v-for="item in wifiAps" :key="item[0]" v-if="item[0].length > 0" class="float-left cursor-pointer col-11 selected" @click="setWifiAP(item[0])" >
<li v-for="(item,index) in wifiAps" :key="index" v-if="item[0].length > 0" class="float-left cursor-pointer col-11 selected" @click="setWifiAP(item[0])" >
<span v-if="item[0] == currentwifiap && item[0].length > 0" class="float-left cursor-pointer sans-serif-bold overflow-hidden" style="width: 100%;">{{item[0]}}</span>
<span v-else class="float-left cursor-pointer sans-serif-normal overflow-hidden" style="width:70%;">{{item[0]}}</span>
</li>
Expand All @@ -38,7 +38,7 @@
<div class="sans-serif-normal text-align large-fontsize">Security Protocol</div>
<div class="text-align cursor-pointer selected-wifi" @click="getSecurityModeList()">{{currentprotocol}} <div v-if="this.editProp === false" class='float-right'>&#9662;</div></div>
<ul class='dropdown-encyption hide' >
<li v-for="item in encryptModes" :key="item[0]" v-if="item[0].length > 0" class="float-left cursor-pointer col-11 selected" @click="setSecurityOptions(item)" >
<li v-for="(item,index) in encryptModes" :key="index" v-if="item[0].length > 0" class="float-left cursor-pointer col-11 selected" @click="setSecurityOptions(item)" >
<span v-if="item == currentprotocol" class="float-left cursor-pointer sans-serif-bold overflow-hidden" style="width: 100%;">{{item}}</span>
<span v-else class="float-left cursor-pointer sans-serif-normal overflow-hidden" style="width:70%;">{{item}}</span>
</li>
Expand Down Expand Up @@ -262,7 +262,10 @@ export default {
}
},
mounted: function () {
this.$store.dispatch('getAllAPs')
// omitted extra fetch aps call in case of user addition
if (this.testProp !== 'user') {
this.$store.dispatch('getAllAPs')
}
}
}
</script>
8 changes: 4 additions & 4 deletions ux/src/store/store.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const store = new Vuex.Store({
state: {
schema: '',
build_id: '',
ux_id: '',
// ux_id: '',
credentials: {
username: '',
password: ''
Expand Down Expand Up @@ -84,7 +84,7 @@ const store = new Vuex.Store({
'SET_SCHEMA': function (state, response) {
state.schema = response.body.version
state.build_id = response.body.build_id
state.ux_id = response.body.ux_id
// state.ux_id = response.body.ux_id
},
'GET_CREDS': function (state, response) {
if (response.body.configState) {
Expand All @@ -101,8 +101,8 @@ const store = new Vuex.Store({
// response.body = []
state.configuration.wifi_aps = response.body
state.configuration.wifi_aps_current = response.body[0][0]
router.push('/configure')
state.currentPage = 'configure'
// router.push('/configure')
// state.currentPage = 'configure'
},
'SAVE_CONFIGURATION': function (state, response) {
// removing loaders
Expand Down
Loading

0 comments on commit 422f145

Please sign in to comment.