Skip to content

Commit

Permalink
Merge beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcelGoerentz
marcelGoerentz committed Nov 6, 2024
2 parents e0e690c + 8690e7c commit 79a568d
Show file tree
Hide file tree
Showing 24 changed files with 857 additions and 1,046 deletions.
31 changes: 20 additions & 11 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,26 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$THREADFIN
# Set working directory
WORKDIR $THREADFIN_HOME

RUN apk update && apk upgrade
RUN apk add ca-certificates curl ffmpeg vlc
#Set variables
RUN DEBIAN_FRONTEND=noninteractive && TZ="America/New_York"

RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apk add tzdata
# Install needed packages
RUN apk update && apk upgrade && apk add ca-certificates curl ffmpeg vlc doas tzdata

# Add group wheel to doas
RUN echo "permit persist :wheel" >> /etc/doas.d/doas.conf

# Add threadfin group and user
RUN addgroup -S threadfin -g ${THREADFIN_GID} \
&& adduser threadfin -G threadfin -u ${THREADFIN_UID} -g ${THREADFIN_GID} -s /bin/sh -D \
&&adduser threadfin wheel \
&& echo "threadfin:threadfin" | chpasswd

# For VLC
RUN sed -i 's/geteuid/getppid/' /usr/bin/vlc

# Set user
USER threadfin

RUN mkdir -p $THREADFIN_BIN

Expand All @@ -70,9 +86,6 @@ RUN chmod +rx $THREADFIN_BIN/threadfin && mkdir $THREADFIN_HOME/cache
# Create working directories for Threadfin
RUN mkdir $THREADFIN_CONF && chmod a+rwX $THREADFIN_CONF && mkdir $THREADFIN_TEMP && chmod a+rwX $THREADFIN_TEMP

# For VLC
RUN sed -i 's/geteuid/getppid/' /usr/bin/vlc

# Add threadfin group and user
RUN addgroup -S threadfin -g ${THREADFIN_GID} && adduser -S threadfin -G threadfin -u ${THREADFIN_UID} -g ${THREADFIN_GID} -s /bin/sh

Expand All @@ -82,8 +95,4 @@ VOLUME $THREADFIN_TEMP

EXPOSE $THREADFIN_PORT

# Set user
USER threadfin

# Run the Threadfin executable
ENTRYPOINT ${THREADFIN_BIN}/threadfin -port=${THREADFIN_PORT} -config=${THREADFIN_CONF} -debug=${THREADFIN_DEBUG} -branch=${THREADFIN_BRANCH}
ENTRYPOINT ["/bin/sh", "-c", "threadfin -port=${THREADFIN_PORT} -config=${THREADFIN_CONF} -debug=${THREADFIN_DEBUG} -branch=${THREADFIN_BRANCH}"]
6 changes: 0 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
5 changes: 2 additions & 3 deletions html/configuration.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@
<div id="popup" class="modal fade">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header" id="popup_header"></div>
<div class="modal-header" id="popupHeader"></div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div id="popup-custom"></div>
<div id="popupCustom"></div>
</div>
</div>
</div>
<div class="modal-footer" id="popup_footer"></div>
</div>
</div>
</div>
Expand Down
70 changes: 30 additions & 40 deletions html/css/screen.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ nav p {
float: right;
}

#settings-footer {}


/* Wizard*/
#box {
background-color: #444;
Expand Down Expand Up @@ -202,12 +199,6 @@ nav p {
padding: 2px;
}

#activeStreams,
#inactiveStreams {
/* width: 50%; */
/* float: left; */
}

#activeStreams .tdKey,
#inactiveStreams .tdKey {
width: 115px;
Expand Down Expand Up @@ -254,23 +245,23 @@ caption {
overflow-y: scroll;
}

#content_table,
#inactive_content_table,
#contentTable,
#inactiveContentTable,
#mapping-detail-table,
#content_table {
#contentTable {
display: table;
--bs-table-color: none;
border-collapse: collapse;
overflow-y: scroll;
}

#inactive_content_table {
#inactiveContentTable {
margin-top: 2%;
}


#content_table .content_table_header,
#inactive_content_table .inactive_content_table_header {
#contentTable .contentTableHeader,
#inactiveContentTable .inactiveContentTableHeader {
background-color: #333;
height: 50px;
border-bottom: solid 1px #111;
Expand All @@ -292,34 +283,34 @@ tbody {
white-space: nowrap;
}

#content_table img,
#inactive_content_table img {
#contentTable img,
#inactiveContentTable img {
display: block;
margin-left: auto;
margin-right: auto;
max-width: 60px;
}

#content_table tr,
#inactive_content_table tr {
#contentTable tr,
#inactiveContentTable tr {
border-left: solid 3px 444;
border-bottom: solid 1px #333;
cursor: pointer;
}

#content_table tr:hover,
#inactive_content_table tr:hover {
#contentTable tr:hover,
#inactiveContentTable tr:hover {
background-color: #333;
}

#content_table td,
#inactive_content_table td {
#contentTable td,
#inactiveContentTable td {

padding: 0px 2px;
}

#content_table input[type=text],
#inactive_content_table input[type=text] {
#contentTable input[type=text],
#inactiveContentTable input[type=text] {
width: 80%;
min-width: 35px;
max-width: 60px;
Expand All @@ -329,8 +320,8 @@ tbody {
text-align: left;
}

#content_table input[type=checkbox],
#inactive_content_table input[type=checkbox] {
#contentTable input[type=checkbox],
#inactiveContentTable input[type=checkbox] {
max-width: 25px;
margin: auto;
}
Expand All @@ -344,15 +335,13 @@ tbody {
display: none;
}

.noBulk {}

#content_table tr.activeEPG,
#inactive_content_table tr.activeEPG {
#contentTable tr.activeEPG,
#inactiveContentTable tr.activeEPG {
border-left: solid 3px lawngreen;
}

#content_table tr.notActiveEPG,
#inactive_content_table tr.notActiveEPG {
#contentTable tr.notActiveEPG,
#inactiveContentTable tr.notActiveEPG {
border-left: solid 3px red;
}

Expand Down Expand Up @@ -548,11 +537,17 @@ tbody {
display: flex;
flex-direction: column;
}
}

@media only screen and (max-width: 620px) {
body {
background-color: #444; /* Ensure the background color is consistent */
}

#settings,
#settings-footer {}
/* Add any other styles specific to small devices here */
}


/*
===============
Sidebar
Expand Down Expand Up @@ -721,11 +716,6 @@ Sidebar
.show-sidebar .close-btn {
display: block;
}
@media screen and (min-width: 676px) {
.sidebar {
width: 1000px;
}
}

.sidebar .card {
width: 44em;
Expand Down
72 changes: 25 additions & 47 deletions html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,70 +20,48 @@

<body onload="javascript: PageReady();">

<div class="banner">
</div>

<div id="loading" class="modal fade">
<div class="modal-dialog loader"></div>
</div>

<div id="popup" class="modal fade">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header" id="popup_header"></div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div id="popup-custom">
<div class="modal-content" id="popupModalContent">
<div class="modal-header" id="popupHeader"></div>
<div class="modal-body" id="popupBody">
<div class="container-fluid" id="popupBodyContainer">
<div class="row" id="popupRow">
<div id="popupCustom">
</div>
</div>
</div>
</div>
<div class="modal-footer" id="popup_footer"></div>
</div>
</div>
</div>

<div class="modal fade" id="ip_selection">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">IP selection</h3>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div class="card text-bg-dark mb-3">
<div class="card-body" id="checkbox_container">
Select one or more IP(s). If none has been selected then Threadfin will bind to all of them!
<table id="checkboxTable">
<!-- Checkboxes will be added automatically -->
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="modal fade" id="ip_selection">
<div class="modal fade" id="versionModal" tabindex="-1" aria-labelledby="versionModalLabel" aria-hidden="true">
<div class="modal-dialog modal-xl">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">IP selection</h3>
<h3 class="modal-title" id="versionModalLabel">New Version Available</h3>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="row">
<div class="card text-bg-dark mb-3">
<div class="card-body" id="checkbox_container">
Select one or more IP(s). If none has been selected then Threadfin will bind to all of them!
<table id="checkboxTable">
<!-- Checkboxes will be added automatically -->
<table>
<tbody>
<tr>
<td>A new version of the application is available. Please update to the latest version.</td>
<td>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" id="updateNow">Update Now</button>
</td>
</tr>
</tbody>
</table>
</div>
</div>
Expand Down Expand Up @@ -186,12 +164,12 @@ <h3 class="modal-title">Server Information</h3>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.11/clipboard.min.js" integrity="sha512-7O5pXpc0oCRrxk8RUfDYFgn0nO1t+jLuIOQdOMRp4APB7uZ4vSjspzp5y6YDtDs4VzUSTbWzBFZ/LKJhnyFOKw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script language="javascript" type="text/javascript" src="js/network_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/option_dialogue_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/menu_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/settings_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/logs_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/base_ts.js"></script>
<script language="javascript" type="text/javascript" src="js/banner.js"></script>
<script language="javascript" type="text/javascript" src="js/network.js"></script>
<script language="javascript" type="text/javascript" src="js/option_dialogue.js"></script>
<script language="javascript" type="text/javascript" src="js/menu.js"></script>
<script language="javascript" type="text/javascript" src="js/settings.js"></script>
<script language="javascript" type="text/javascript" src="js/logs.js"></script>
<script language="javascript" type="text/javascript" src="js/base.js"></script>
<script language="javascript" type="text/javascript" src="js/version_check.js"></script>
</body>
</html>
9 changes: 4 additions & 5 deletions package-lock.json
View file

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

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"tsc": "^2.0.4"
},
"devDependencies": {
"typescript": "^5.5.2"
"typescript": "^5.5.4"
}
}
Loading

0 comments on commit 79a568d

Please sign in to comment.