Merge pull request #23 from animegasan/master

Add iStore and Fix Logout

.github/workflows/main.yml

@@ -0,0 +1,124 @@
+name: "Build Theme Alpha | OpenWrt SDK"
+on:
+  repository_dispatch:
+  workflow_dispatch:
+    inputs:
+      ssh:
+        description: 'SSH connection to Actions'
+        required: false
+        default: 'false'
+  push:
+    branches:
+      - 'master'
+    paths:
+      - 'luci-theme-alpha/Makefile'
+env:
+  TZ: Asia/Jakarta
+
+
+jobs:
+  job_check:
+    if: github.repository == ${{ github.repository }}
+    name: Check Version
+    runs-on: ubuntu-latest
+    outputs:
+      alpha_version: ${{ steps.check_version.outputs.latest_version }}
+      has_update: ${{ steps.check_version.outputs.has_update }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+          ref: 'master'
+
+      - name: Check version
+        id: check_version
+        env:
+          url_release: https://api.github.com/repos/${{ github.repository }}/releases/latest
+        run: |
+          latest_version=$(grep -oP 'PKG_VERSION:=\K.*' Makefile | sed 's/^/v/')
+          latest_release=$(wget -qO- -t1 -T2 ${{env.url_release}} | awk -F '"' '/tag_name/{print $4}')
+          has_update=$([ "${latest_version}" != "${latest_release}" ] && echo true || echo false)
+          echo "latest_version=${latest_version}" >> $GITHUB_OUTPUT
+          echo "has_update=${has_update}" >> $GITHUB_OUTPUT
+          echo "latest_version: ${latest_version}"
+          echo "latest_release: ${latest_release}"
+          echo "has_update: ${has_update}"
+      - name: Generate new tag & release
+        if: steps.check_version.outputs.has_update == 'true'
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          name: Alpha Theme - OpenWrt
+          tag_name: ${{steps.check_version.outputs.latest_version}}
+
+
+  job_build_alpha:
+    name: Build Alpha Theme (master)
+    needs: job_check
+    if: needs.job_check.outputs.has_update == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install packages
+        run: |
+          echo "Install packages"
+          sudo -E apt-get -qq update
+          sudo -E apt-get -qq install build-essential clang flex bison g++ gawk gcc-multilib g++-multilib gettext git libncurses5-dev libssl-dev python3-distutils rsync unzip zlib1g-dev file wget
+          sudo -E apt-get -qq autoremove --purge
+          sudo -E apt-get -qq clean
+      - name: Cache openwrt SDK
+        id: cache-sdk
+        uses: actions/cache@v3
+        with:
+          path: sdk
+          key: openwrt-sdk-21.02-x86-64
+
+      - name: Initialization environment
+        if: steps.cache-sdk.outputs.cache-hit != 'true'
+        env:
+          url_sdk: https://archive.openwrt.org/releases/21.02.5/targets/x86/64/openwrt-sdk-21.02.5-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz
+        run: |
+          wget ${{ env.url_sdk }}
+          file_name=$(echo ${{env.url_sdk}} | awk -F/ '{print $NF}')
+          mkdir sdk && tar -xJf $file_name -C ./sdk --strip-components=1
+          cd sdk  
+          echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-21.02" > feeds.conf
+          echo "src-git-full packages https://github.com/openwrt/packages.git;openwrt-21.02" >> feeds.conf
+          echo "src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-21.02" >> feeds.conf
+          echo "src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-21.02"  >> feeds.conf
+          git clone -b master https://github.com/${{ github.repository }}.git package/downloads/luci-theme-alpha
+          ./scripts/feeds update -a
+          echo "CONFIG_PACKAGE_luci-theme-alpha=m" > .config
+          ./scripts/feeds install -d n luci-theme-alpha
+          make download -j8
+      - name: Configure Alpha Theme (master)
+        run: |
+          cd sdk
+          ./scripts/feeds install luci-theme-alpha
+          echo "CONFIG_ALL_NONSHARED=n" > .config
+          echo "CONFIG_ALL_KMODS=n" >> .config
+          echo "CONFIG_ALL=n" >> .config
+          echo "CONFIG_AUTOREMOVE=n" >> .config
+          echo "CONFIG_LUCI_LANG_zh_Hans=n" >> .config
+          echo "CONFIG_PACKAGE_luci-theme-alpha=m" >> .config
+          make defconfig
+      - name: Compile Alpha Theme (master)
+        id: compile
+        run: |
+          cd sdk
+          echo "make package/luci-theme-alpha/{clean,compile} -j$(nproc)"
+          make package/luci-theme-alpha/{clean,compile} -j$(nproc)
+          mv bin/packages/x86_64/base/ ../
+          rm .config .config.old
+          cd ..
+          echo "status=success" >> $GITHUB_OUTPUT
+          echo "FIRMWARE=$PWD" >> $GITHUB_ENV
+      - name: Upload Alpha Theme (master) ipks to release
+        uses: softprops/action-gh-release@v1
+        if: steps.compile.outputs.status == 'success'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{needs.job_check.outputs.alpha_version}}
+          files: ${{ env.FIRMWARE }}/base/luci-theme*.ipk

Makefile

@@ -10,8 +10,8 @@ THEME_NAME:=alpha
 THEME_TITLE:=Alpha
 
 PKG_NAME:=luci-theme-$(THEME_NAME)
-PKG_VERSION:=0.3.9-beta
-PKG_RELEASE:=8
+PKG_VERSION:=3.9.4-beta
+PKG_RELEASE:=9
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -40,6 +40,8 @@ define Package/luci-theme-$(THEME_NAME)/install
 	$(CP) -a ./template/* $(1)/usr/lib/lua/luci/view/themes/$(THEME_NAME)/ 2>/dev/null || true
 	$(INSTALL_DIR) $(1)/www/luci-static/resources
 	$(CP) -a ./js/* $(1)/www/luci-static/resources/ 2>/dev/null || true
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) -a ./root/etc/config/* $(1)/etc/config/ 2>/dev/null || true
 endef
 
 define Package/luci-theme-$(THEME_NAME)/postinst

README.md

@@ -1,5 +1,12 @@
-[issues]: https://github.com/jerrykuku/luci-app-argon-config/issues/new
+[issues]: https://github.com/derisamedia/luci-theme-alpha/issues
 [issues-badge]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=flat-square
+[release]: https://github.com/derisamedia/luci-theme-alpha/releases
+[release-badge]: https://img.shields.io/badge/download-check_releases-blue
+[group]: https://facebook.com/groups/indowrt
+[group-badge]: https://img.shields.io/badge/visit_Facebook-Comunity-cyan
+[discord]: https://discord.gg/gdZwmDQGUm
+[discord-badge]: https://img.shields.io/badge/visit_Discord-Comunity-blue
+
 
 
 
@@ -11,7 +18,9 @@
 <img src="https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/luasrc/brand.png">
 
 [![issues][issues-badge]][issues]
-
+[![release][release-badge]][release]
+[![group][group-badge]][group]
+[![discord][discord-badge]][discord]
 
 
 Luci theme for Official Openwrt and Alpha OS build ,based on bootstrap and material luCi theme refferences,
@@ -22,11 +31,22 @@ Luci theme for Official Openwrt and Alpha OS build ,based on bootstrap and mater
   
 ![image](https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/ss2.png)
 
+![image](https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/ss3.png)
+
+![image](https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/mobileview1.png)
+
+![image](https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/mobileview2.png)
+
+![image](https://raw.githubusercontent.com/derisamedia/luci-theme-alpha/master/mobileview3.png)
+
 </p>
 
 ### FYI
 
-alpha os is my idea which is to develop the Indonesian OpenWrt community so that it can grow even overseas (China already has looking), in the sense that we have to make an innovation that appears and is new, not the existing one, made our version, Mr. Sibondt once they said 'jalan ditempat komunitas indo', that's what moved my heart to make an innovation that I named alpha os (alpha = initial version, because it hasn't been perfect until now 😁)
+alpha os is my idea which wants to develop the OpenWrt community in Indonesia, even the world, thanks to friends who have supported this alpha-os theme, hopefully given health to all of us.
+
+
+(old text) Mr. Sibondt once they said 'jalan ditempat komunitas indo', that's what moved my heart to make an innovation that I named alpha os (alpha = initial version, because it hasn't been perfect until now 😁)
 
 donate
 buy me a padang rice or coffee

luasrc/gaya/icon/sidebar-icon/istore.svg

@@ -0,0 +1,12 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg fill="#fff" width="800px" height="800px" viewBox="0 0 1024 1024" t="1569683928793" class="icon" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15091" xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(-1, 0, 0, 1, 0, 0)" stroke="#fff">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier">
+
<defs>
+
<style type="text/css"/>
+
</defs>
+
<path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H212V212h200v200zM864 144H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H612V212h200v200zM864 544H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16z m-52 268H612V612h200v200zM424 712H296V584c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v128H104c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h128v128c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V776h128c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z" p-id="15092"/>
+
</g>
+
</svg>

luasrc/style/style.css

@@ -1,4 +1,3 @@
-
 /*--------------------
 catatan usahakan untuk mengganti bg pakai format png, kalo jpg ganti aja di bagian body, sesuaikan aja nama formatnya
 ---------------------*/
@@ -17,7 +16,6 @@ html {
 }
 
 body {
-background: url('backgroundfanspage.png');
 	height: 100%;
 	background-position: center;
 	background-repeat: no-repeat;
@@ -30,7 +28,8 @@ background-attachment: fixed;
 Text
 ---------------------*/
 
-h2, h3 {
+h2,
+h3 {
 	font-size: 16px;
 	letter-spacing: -1px;
 	line-height: 20px;
@@ -162,12 +161,12 @@ Login Box
 	z-index: 2;
 	-webkit-backdrop-filter: blur(10px);
 	backdrop-filter: blur(10px);
-  -webkit-border-radius: 20px:
-  -moz-border-radius= 20px;
+	-webkit-border-radius: 20px: -moz-border-radius=20px;
 	border-radius: 20px;
 	-moz-box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
 	box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
 }
+
 .box-info {
 	width: 260px;
 	top: 60px;
@@ -200,9 +199,13 @@ Login Box
 Form
 ---------------------*/
 
-a { text-decoration: none; }
+a {
+	text-decoration: none;
+}
 
-button:focus { outline:0; }
+button:focus {
+	outline: 0;
+}
 
 .b {
 	height: 24px;
@@ -228,7 +231,8 @@ button:focus { outline:0; }
 	opacity: 1;
 }
 
-.b-support, .b-cta {
+.b-support,
+.b-cta {
 	width: 100%;
 	padding: 0px 15px;
 	font-family: 'Quicksand', sans-serif;
@@ -256,7 +260,8 @@ button:focus { outline:0; }
 	color: #fff;
 }
 
-.b-support:hover, .b-cta:hover {
+.b-support:hover,
+.b-cta:hover {
 	color: #fff;
 	background-color: #87314e;
 	border: #87314e 1px solid;
@@ -357,8 +362,13 @@ p.field span.i {
 Transitions
 ---------------------*/
 
-.box-form, .box-info, .b, .b-support, .b-cta,
-input[type=submit], p.field span.i {
+.box-form,
+.box-info,
+.b,
+.b-support,
+.b-cta,
+input[type=submit],
+p.field span.i {
 
 	-webkit-transition: all 0.3s;
 	-moz-transition: all 0.3s;

root/etc/config/alpha

@@ -0,0 +1,10 @@
+
+config alpha 'config'
+	option nav_01 '/cgi-bin/luci/admin/status/overview'
+	option nav_02 '/cgi-bin/luci/admin/services/ttyd'
+	option nav_03 '/cgi-bin/luci/admin/services/openclash'
+	option nav_04 '/cgi-bin/luci/admin/nas/tinyfm'
+	option nav_05 '/cgi-bin/luci/admin/modem/main'
+	option nav_06 '/cgi-bin/luci/admin/network/network'
+	option blur '20'
+	option color '#2222359a'

template/footer.htm

@@ -1,7 +1,7 @@
 <%#
 	Alpha os is made from me for all .. especially for indo wrt members and fan of OpenWrt or DBAI Community
 	luci-theme-alpha
-	Copyright 2022 derisamedia <facebook.com/derisamedia>
+	Copyright 2024 derisamedia <facebook.com/derisamedia>
 	Have a bug? Please create an issue here on GitHub!
 
 	luci-theme-material
@@ -17,17 +17,92 @@
 
 	Licensed to the public under the Apache License 2.0
 -%>
+<% 
+local ver = require "luci.version"
+local uci = require "luci.model.uci".cursor()
+local config = uci:get_all("alpha", "config")
+local icon = {
+	['/cgi-bin/luci/admin/status/overview'] = '/gaya/icon/navbar/status.png',
+	['/cgi-bin/luci/admin/services/ttyd'] = '/gaya/icon/navbar/terminal.png',
+	['/cgi-bin/luci/admin/services/openclash'] = '/gaya/icon/navbar/oc.png',
+	['/cgi-bin/luci/admin/nas/tinyfm'] = '/gaya/icon/navbar/nas.png',
+	['/cgi-bin/luci/admin/modem/main'] = '/gaya/icon/navbar/modem.png',
+	['/cgi-bin/luci/admin/network/network'] = '/gaya/icon/navbar/interface.png',
+	['/cgi-bin/luci/admin/services/neko'] = '/gaya/icon/navbar/neko.png'
+}
+
+local function getLink(nav)
+	local link = config[nav]
+	return (link and link ~= "none") and link or nil
+end
+
+local num_links = 0
+for i = 1, 6 do
+	local nav_key = 'nav_0' .. i
+	local link = getLink(nav_key)
+	if link then
+		num_links = num_links + 1
+	end
+end
+
+local link_width = string.format("calc(100%% / %d)", num_links)
+local blur_value = tonumber(config.blur)
+local link_blur = string.format("blur(%dpx)", blur_value)
+local background_color = config.color
+%>
+
+<style>
+.main>.main-left, .cbi-section, .cbi-section-error, #iptables, .Firewall form, #cbi-network>.cbi-section-node, #cbi-wireless>.cbi-section-node, #cbi-wireless>#wifi_assoclist_table, [data-tab-title], [data-page^="admin-system-admin"]:not(.node-main-login) .cbi-map:not(#cbi-dropbear), [data-page="admin-system-opkg"] #maincontent>.container, .tabs, .cbi-tabmenu, .cbi-tooltip {
+	background-color: <%=background_color%>;
+	backdrop-filter: <%=link_blur%>;
+	-webkit-backdrop-filter: <%=link_blur%>;
+}
+
+@media screen and (max-width: 720px) {
+	.navbar a {
+		width: <%=link_width%>;
+	}
+}
+</style>
 
-<% local ver = require "luci.version" %>
 </div>
 <footer class="mobile">
-	<a href="https://github.com/derisamedia/luci-theme-alpha"><%= ver.luciname %> | <%= ver.luciversion %> | Alpha OS Theme v3.8</a>
+	<a href="https://github.com/derisamedia/luci-theme-alpha"><%=ver.luciname%> | <%=ver.luciversion%> | Alpha OS Theme v3.9</a>
 </footer>
 </div>
+<div class="navbar active">
+	<div class="dropdown">
+		<% for i = 1, 6 do 
+			local nav_key = 'nav_0' .. i
+			local link = getLink(nav_key)
+			if link then %>
+				<a href="<%=link%>">
+					<img src="<%=media%><%=icon[link]%>" />
+				</a>
+			<% end
+		end %>
+	</div>
+	<label class="toggler">
+		<img src="<%=media%>/gaya/icon/arrow.svg">
+	</label>
+</div>
+<script>
+{
+	const nav = document.querySelector(".navbar");
+	let lastScrollY = window.scrollY;
+	window.addEventListener("scroll", () => {
+		if (lastScrollY < window.scrollY) {
+			nav.classList.add("navbar--hidden");
+		} 
+		else {
+			nav.classList.remove("navbar--hidden");
+		}
+		lastScrollY = window.scrollY;
+	});
+}
+</script>
 </div>
-
 <script type="text/javascript">L.require('menu-alpha')</script>
 <script src="<%=media%>/app.js"></script>
-
 </body>
 </html>

template/header.htm

@@ -57,42 +57,10 @@
 </style>
 <% end -%>
 </head>
-<body class="lang_<%=luci.i18n.context.lang%> <% if luci.dispatcher.context.authsession then %>logged-in<% end %> <% if not (path == "") then %>node-<%= path %><% else %>node-main-login<% end %>" data-page="<%= pcdata(path) %>">
+<body class="lang_<%=luci.i18n.context.lang%> <% if luci.dispatcher.context.authsession then %>logged-in<% end %> <% if not (path == "") then %>node-<%= path %><% else %>node-main-login<% end %>" data-page="<%= pcdata(path) %>" style="background-image:url('/luci-static/alpha/background/dashboard.png')">
 <header>
-	<div class="navbar active">
-		<div class="dropdown">
-			
-	<a href="/cgi-bin/luci/admin/status/overview"><img src="<%=media%>/gaya/icon/navbar/status.png" /></a>
- <a href="/cgi-bin/luci/admin/services/ttyd"><img src="<%=media%>/gaya/icon/navbar/terminal.png" /></a>
-  <a href="/cgi-bin/luci/admin/services/openclash"><img src="<%=media%>/gaya/icon/navbar/oc.png" /></a>
-  <a href="/cgi-bin/luci/admin/nas/tinyfm"><img src="<%=media%>/gaya/icon/navbar/nas.png" /></a>
-  <a href="/cgi-bin/luci/admin/modem/main"><img src="<%=media%>/gaya/icon/navbar/modem.png" /></a>
-  <a href="/cgi-bin/luci/admin/network/network"><img src="<%=media%>/gaya/icon/navbar/interface.png" /></a>
-
-			</div>
-        <label class="toggler">
-			<img src="<%=media%>/gaya/icon/arrow.svg" alt="">
-		</label>
-</div>
-<script>
-	{
-  const nav = document.querySelector(".navbar");
-  let lastScrollY = window.scrollY;
-
-  window.addEventListener("scroll", () => {
-    if (lastScrollY < window.scrollY) {
-      nav.classList.add("navbar--hidden");
-    } else {
-      nav.classList.remove("navbar--hidden");
-    }
-
-    lastScrollY = window.scrollY;
-  });
-}
-	</script>
 	<div class="fill">
 		<div class="container">
-          
 		<a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>">
 			<img src="<%=media%>/brand.png" alt="OpenWrt">
 		</a>
@@ -125,5 +93,4 @@
 						<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
 					</div>
 				</noscript>
-
 				<div id="tabmenu" style="display:none"></div>

template/sysauth.htm

@@ -20,10 +20,8 @@
 <title>Alpha - Login Dulu</title>
 </head>
 		
-<body class="lang_en  node-main-login" data-page="">
+<body class="lang_en  node-main-login" data-page="" style="background-image:url('/luci-static/alpha/background/dashboard.png')">
 	<header>
-          
-
 		<div class="fill">
 			<div class="container">
 				<span class="showSide"></span>